quartz: fix quartz build

The quartz backend has its own implementation of these that
collide since the gtkdragdest.c extraction.

https://bugzilla.gnome.org/show_bug.cgi?id=764712

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e5460730ceae0e7b9b37947262f50279e3a9508d..180c423b8c20ecf73b73106f81b59735e55fa90b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -737,7 +737,6 @@ gtk_base_c_sources =                \
        gtkcsswidgetnode.c      \
         gtkcsswin32sizevalue.c  \
        gtkdialog.c             \
-       gtkdragdest.c           \
        gtkdragsource.c         \
        gtkdrawingarea.c        \
        gtkeditable.c           \
@@ -959,7 +958,8 @@ gtk_base_c_sources +=               \
 else
 gtk_base_c_sources +=          \
        gtkclipboard.c          \
-       gtkdnd.c
+       gtkdnd.c                \
+       gtkdragdest.c
 endif
 
 nodist_gtk_c_sources =

diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 7fe27b6008aa9be6ae23d7369b63cc2e8723cc7c..6198986f6ddeb6cc3e72a1d51d5b6239e8ba2739 100644 (file)
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -46,7 +46,6 @@
 #include "gtkiconhelperprivate.h"
 
 typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
-typedef struct _GtkDragDestSite GtkDragDestSite;
 typedef struct _GtkDragDestInfo GtkDragDestInfo;
 typedef struct _GtkDragFindData GtkDragFindData;
 
@@ -82,15 +81,6 @@ struct _GtkDragSourceInfo
   gboolean           delete;
 };
 
-struct _GtkDragDestSite 
-{
-  GtkDestDefaults    flags;
-  GtkTargetList     *target_list;
-  GdkDragAction      actions;
-  guint              have_drag : 1;
-  guint              track_motion : 1;
-};
-
 struct _GtkDragDestInfo 
 {
   GtkWidget         *widget;      /* Widget in which drag is in */